cssimagebuiltin: Remove icons that don't draw anything anymore

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 03e8ddbc3eb6af7c7269cc67ac4545d22a977678..a27452474b505b36e95a54fe1f290dd78cede2e0 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -127,11 +127,11 @@ gtk_check_button_update_node_state (GtkWidget *widget)
    * way to update the icon
    */
   if (state & GTK_STATE_FLAG_CHECKED)
-    image_type = GTK_IS_RADIO_BUTTON (widget) ? GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED : GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED;
+    image_type = GTK_IS_RADIO_BUTTON (widget) ? GTK_CSS_IMAGE_BUILTIN_OPTION : GTK_CSS_IMAGE_BUILTIN_CHECK;
   else if (state & GTK_STATE_FLAG_INCONSISTENT)
     image_type = GTK_IS_RADIO_BUTTON (widget) ? GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT : GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT;
   else
-    image_type = GTK_IS_RADIO_BUTTON (widget) ? GTK_CSS_IMAGE_BUILTIN_OPTION : GTK_CSS_IMAGE_BUILTIN_CHECK;
+    image_type = GTK_CSS_IMAGE_BUILTIN_NONE;
   gtk_builtin_icon_set_image (GTK_BUILTIN_ICON (priv->indicator_gadget), image_type);
 
   gtk_css_gadget_set_state (priv->indicator_gadget, state);

diff --git a/gtk/gtkcssimagebuiltin.c b/gtk/gtkcssimagebuiltin.c
index 5b059dbc0c7d69aa31e98c0f19a97dac65b70187..3a65747f801500fd365194f3142f090070869293 100644 (file)
--- a/gtk/gtkcssimagebuiltin.c
+++ b/gtk/gtkcssimagebuiltin.c
@@ -863,19 +863,17 @@ gtk_css_image_builtin_draw (GtkCssImage            *image,
   case GTK_CSS_IMAGE_BUILTIN_NONE:
     break;
   case GTK_CSS_IMAGE_BUILTIN_CHECK:
-  case GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED:
   case GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT:
     gtk_css_image_builtin_draw_check (image, cr,
                                       width, height,
-                                      image_type == GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
+                                      image_type == GTK_CSS_IMAGE_BUILTIN_CHECK,
                                       image_type == GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT);
     break;
   case GTK_CSS_IMAGE_BUILTIN_OPTION:
-  case GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED:
   case GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT:
     gtk_css_image_builtin_draw_option (image, cr,
                                        width, height,
-                                       image_type == GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
+                                       image_type == GTK_CSS_IMAGE_BUILTIN_OPTION,
                                        image_type == GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT);
     break;
   case GTK_CSS_IMAGE_BUILTIN_ARROW_UP:

diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 857c8238600d011b8704b576319c5ef1d7be9964..3f5ce93f23530074da0137773d860e8bd862d7ae 100644 (file)
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -233,10 +233,8 @@ enum { /*< skip >*/
 typedef enum /*< skip >*/ {
   GTK_CSS_IMAGE_BUILTIN_NONE,
   GTK_CSS_IMAGE_BUILTIN_CHECK,
-  GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
   GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT,
   GTK_CSS_IMAGE_BUILTIN_OPTION,
-  GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
   GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT,
   GTK_CSS_IMAGE_BUILTIN_ARROW_UP,
   GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN,

diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 0e941c2808063969670f3fdcb9d9ac337fe95f83..209f60de3dc3b2fd6c4750151dbcaa254591b8fd 100644 (file)
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -210,12 +210,11 @@ gtk_model_button_update_state (GtkModelButton *button)
       if (button->active && !button->menu_name)
         {
           indicator_state |= GTK_STATE_FLAG_CHECKED;
-          image_type = GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED;
+          image_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
         }
       else
         {
           indicator_state &= ~GTK_STATE_FLAG_CHECKED;
-          image_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
         }
     }
   if (button->role == GTK_BUTTON_ROLE_RADIO)
@@ -223,12 +222,11 @@ gtk_model_button_update_state (GtkModelButton *button)
       if (button->active && !button->menu_name)
         {
           indicator_state |= GTK_STATE_FLAG_CHECKED;
-          image_type = GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED;
+          image_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
         }
       else
         {
           indicator_state &= ~GTK_STATE_FLAG_CHECKED;
-          image_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
         }
     }
 

diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c
index 42cd58f7f284faf0c2f8d959abba73eb067fb52b..1c515c17ab9a8e786e1ab815ca17f9b4e5ca8b94 100644 (file)
--- a/gtk/gtkrender.c
+++ b/gtk/gtkrender.c
@@ -52,9 +52,9 @@ gtk_do_render_check (GtkStyleContext *context,
   if (state & GTK_STATE_FLAG_INCONSISTENT)
     image_type = GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT;
   else if (state & GTK_STATE_FLAG_CHECKED)
-    image_type = GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED;
-  else
     image_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
+  else
+    image_type = GTK_CSS_IMAGE_BUILTIN_NONE;
 
   gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, width, height, image_type);
 }
@@ -117,9 +117,9 @@ gtk_do_render_option (GtkStyleContext *context,
   if (state & GTK_STATE_FLAG_INCONSISTENT)
     image_type = GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT;
   else if (state & GTK_STATE_FLAG_CHECKED)
-    image_type = GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED;
-  else
     image_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
+  else
+    image_type = GTK_CSS_IMAGE_BUILTIN_NONE;
 
   gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, width, height, image_type);
 }